Fixing single story mode issues.