SWORD25: More int <-> int32 corrections