more badge fixes