small fixes 5