Fixes for recent cleanups