Valve Fixes

Merging Valve fixes