Changes made for attach disk. Few other issues fixed.