Hack for filtering out control messages
Correct some constants