Warnings work

More fixes. The revert was from not originally understanding how to get a change through in qupgrade. Now I do and the most recent commit has it done correctly. Lot of commits, but all small changes. Wanted to maintain the error(s) being fixed in each file.