Taranis PLUS changes and fix Taranis SH bug