few fixes 6