Achievement Hotfix

Hotfix for issues found during testing of todays Achievement Update.
Should resolve the majority of issues on Windows and Linux.