Build fixes

Lingering changes from 0.5.6 publication