Some fixes for errors discovered by running rubocop -l