Fixed some mount partition logic