Various miscellaneous lint fixes