Fix a couple of rubocop failures and loosen the rules a bit more