Various tweeks to make it work better with upcoming dlgconfig