Fixed various small bugs plus set the right required fields for Message