Fix some mutations
Merge branch 'master' of github.com:Nekith/strayFw