Fixes to achievement class