fixes for some vm tests