Updated to latest dmd code