Fixes to badgekit role