fixes for v1.0.0 (r2)