more fixes for str_size_and_int64 branch