Fixes in 1.0.x.