Core/Chat Build Fix