Fixes for 64-bit and (apparently) dub 0.9.22