Minor cleanups before 0.9.0