Defence: Fix final minor problems