Fixed achievements handling