Fixing issues left-over from the last master merge.