Add few fixes