More debug queue build fixing.