[PATCH 0/2] Another round of CH driver fixes