Fixes for CP2 driver and Remote Terminal.