Fix small bugs in red badge