Fix message parameter. Some cleanup.