Fix syntax issues from last commit