Merge in fixes