Fixes for dtests