Fixes to generator command.