Fixed bugs with ESXi configuration (5.5.0u1 test OK)