Merge back fixes for release 0.2.0