@0.0.2 minor cleanups