Packaging fixes for pbulk, and general tidying.