small fixes 4