Bugfixes for new convert dir support.