Fixed issues with Storyboard crashes.