various adjustments because of hivemq implementation