Some fixes I forgot to include and badger work