Fixes for recent changes.