Various fixes to finish up badge manager functionality.