various hot-fixes