Fixes for a clean ML run