Fix remaining lint warnings