partition fixes 2, may revert

Change-Id: I6afca13e7062532fedeae198a760766f8a1400e7