distiller fixes