Small fixes
Merge branch 'master' of https://github.com/fr3gu/LetsModReboot
Spaceship