Also solves some compiler warnings on linux
- Next step is to actually trigger the achievements in the right places.