Remove some minor issues and improve chat loading