Resolve fuzziness around the badge
Resolve compiler warnings