tiny code gen fixes