Fix for multi-arch to look in the correct directories
3 files changed