Miscellaneous warnings fixes