rubocop and generator fixes