Bug fixes and inital ESXi support (no tests)