Headpin Nightly failures fixed

Please review it once