package and build tweaks