Fixes for defense message formatting