small fixes 9152014