Fixes to dimon