Fixing badges more