Misc ex7 bugfix for --disable-second