Fix issues and add armor message.