Fix syntax error / Schema changes