few fixes fixes