Fix bqueue, jqueue, and sgen for new cluster settings