Fix for warnings-as-errors, from Jamie.