Try and fix failing rubocop tests.