SYNR-340

This PR is primarily for SYNR-340 but also includes fixes for some other small issues: 
SYNR-296
SYNR-299
SYNR-318