Minor fixes for v0.1.1