Minor fixes on the road to initial release