Forgot some changes for 2 partition layout