More fixes - now next action appears to work