Optimise also int32 int64 nativeint, fix bugs