Few fixes for headpin