Merging in fixes.