Fix rubocop for latest versions
Fix rubocop errors