md018-md024, minor fixes