Some bug fixes for v0.0.1