Fix syntax errors since beta SDK