Some fixes for rubocop