Fixing up after merge