Various lint improvements