Fixed several issues related to CONFIRM mask and the way we process messages