Miscellaneous warning fixes
Added missing files from last commit