Defence: Fix numerous minor problems