Warnings

Merge warning fixes and the master branch, then add more warning fixes that only apply to dev.