1.0.25 bug fixes