Fix syntax issues