Fixes for essentials v2.7, and to storyboard