More fixes for recent change