Fixed some CodeField Errors for the Message Handling part