Packages.py: Some more build fixes