rc0.9 bug fixes