d243: minor fixes by Jigoku