Various lint fixes