Bug fixes to saga