Bug fixes to sagas