Minor improvements on D90 and astro feature