Lots of small changes to action queue infrastructure