Make lint happy once again