More fixes
Merge branch 'master' of github.com:ekkodill/jalla