Fixed queue actions, more tweaks