Bug-fixes for recent refactoring.
Merge branch 'master' of https://github.com/vish86/fsm-snaps