Fix ChatGPT issues