1.0.30-dev bug fixes