Rubocop fixes for ruby 2.5