More bug fixes to stabilisation after generalised SCM factoring