Tweaks to queuefeeder