D and other fixes

First patch this year :(