Update for latest Gunsmith changes

change queues