Additional achievements integration/fixes