Fix message size and other stuff