Bugfixes for subtractive generator and raw/simple flow