Pre-release fixes for version 0.2.0