Deal with some lint