Fixes for recent changes