Storyboard internal consistency fixes