SWORD25: More int->int32 fixes