Stufix phony fix
Additional packaing fixes