Tweaks to barbershop source