Fixes according to code review.
Fixes according to code review.

mahirk/shields,freezy-sk/shields,badges/shields,tomap/shields,pine613/shields,mahirk/shields,freezy-sk/shields,badges/shields,pine613/shields,badges/shields,tomap/shields