A lot of updates to make dub/dmd happy. Just wow..