- Bug fixes with Chat