Various fixes
Merge branch 'dev' of github.com:FlansMods/FlansMod into dev