small fixes 2