Various fixes to ssmd_auob.stage2