Adaptations to work with dashi sysname