Dummy mode improvements when generating. Relates to #107.