Arrrrgh. Fixing way too tired to be coding mistakes.

Signed-off-by: Phill Coxon <phillcoxon@gmail.com>