following few fixes