Fix D6 issues

*bump*