Minor tweaks to fix stuff that should have been fixed in the supermerge.