Fixes for dmd 2.061