Miscellaneous warning fixes

done