Rest of SCVMM things found and hopefully fixed