Fixes and uint128 stuff