s4: Make the int32 problem more clear - and fix another error