Fixes for action flow