Addressed some storyboard warnings