build and package fixes