Fixes to badgekit role
Merge changes