Fix bugs in action handling
Merge pull request #2315 from imurchie/isaac-action-fixes

Fix bugs in action handling