Fixes to improve DART integration suggested by Tristan