Fixing things that didn't lint