Moar badge fixes

This should do it