Fixed references
Fixed chat bug