F2 1.1.1 patch

There are a couple of issues we noticed after releasing F2 1.1.