0.6.1 Release

Fixes a few minor build regressions in this release