Terrible hack to make badge work for now.
fix up badge nits