Fixing badges and requirements