Several bug fixes related to IFS and to -regen.