2.0.2 bug fixes