-C fixes for V1 drivers