Fixes to achievements