various fixes.