Fix some more rubocop issues