last few fixes