Minor fix for SYNR-524, SYNR-517, SYNR-514