fixes for per-arch packages