Fixes a few bugs
This would have gone to FF2 2.0, but I can't find the subplugins for that.
See https://github.com/50DKP/FF2/commit/4e4dcb082f0d23e1d01e1c6d4c5f77828311e367
https://github.com/50DKP/FF2/commit/4e4dcb082f0d23e1d01e1c6d4c5f77828311e367
https://github.com/50DKP/FF2/commit/4e4dcb082f0d23e1d01e1c6d4c5f77828311e367