Fixed memory mismatches