Valve fixes