Fix Merge Errors from Previous PR