PAC-JB build tweaks and misc cleanup.