various fixes 2