Clean up lint warnings