setup/packaging fixes