Multiarch Fixes - coccinelle

No unpublished successful runs for coccinelle.