QA mods to fix warnings