Merge fixes from repofixes branch

Merge fixes ahead of beginning work on 0.4.0