Fix some more rubocop rule violations