Miscellaneous warning fixes