few fixes 3