Update for recent master changes