Hotfix #3 - Out of the Water

We found a couple of bugs still messing around with the Settings Panel, they're both dead.