Fix import path
fix typo
Some fixes to the generated program