Fixes for multi-arch