Added support for Boot Device=NONE and fixed issues with cloning.