Some achievements fixes