Hacks until host dmd is updated/ optimizations