Fixes to dm9k tool