More small fixes and refactoring for the controller status send functions