Updates to work with dashi sysname
Tidy up some things after a code review