Fixing up after merge from master