few fixes 2