Some few fixes