adjustments for release-0.3.3