Valve Fixes

Pulling in fixes from Valve