Fixes to multi-arch