Some fixes for boobs and Bot