Fix D6 issues