Some fixes and cleanup for v0.2.0