fixed clean/build/package issues