Some fixes when removing / unmounting a PBI container on 10.0