Add PAC in Black support
Fix build