fixes for recent valve changes