Bugfixes regarding the Diamond tool invocation