Port to astro 0.18.