S commit v1.2 fixes to overflow