more fixes for dancer 2 migration