Packaging and cross-compilation tweaks