Fix broken partitioning. TESTS NEEDED
Helper
Sane default