G02: Fix partition layout