Fixes to pbzip2 build