Adding astro VM and some fixes