Draft-9 bug fixes