Fix control messages