Update to the latest rubocop and fix a few issues it found