Additional fixes for Dust