Minor cleanups before 0.2.beta