Minor API adjustments for 1.0.0