Fixing build errors left over from merge.