Fixes for use with dub.