misc-fixes