Fixing changes broken by merge