Fix chat and base