Fixed up earlier Merge mistakes