Fixes issues introduced in 9f5d18b2af7991ea9ccb1cd7604063a68fac8831 when using additional VM params