more fixes to make rubocop happy