HR-340 fix and additional fixes