Fixes for non-storyboard transitions