Changes to work on real gTar hardware