d241: minor fixes by Artifice