Fix issues with Bitrig patch and version normalisation