Minor cleanups, ng 1.2.0