Fix some issues with initial generation