Badge and other minor fixes