Minor output fixes for v1 release