More HBK-JBL nitpicking