Fixes to do rubocop script and a couple of aliases.