Two fixes for v0.3.1