more fixes for dev generator