Fix syntax errors from previous merge