misc msgr fixes