More partman tinkering woo

Change-Id: Iaeec3c839486505f6f75d42a0f50dffe23cff7c7