Fixed more exceptions from last night's merge.