More Soft40 fixes