Some fixes

No more known major bug