Working through v1.0 fixes.