Improvements and fixes for regressions.
Fix accidentally removed file.