Fix new rubocop issues