Build system works better for different architectures now