Fix queue setup