1.0.34-dev bug fixes