Fixed VMWare issues around autoload order