Some minor fixes after vmLib was added