Communication protocol Fixes and Updates