Pulling in fixes