Fix partition numbering handling with bplan firmware