Fixes for DMD build 8597cda