Fixes for issues found while QAing/integrating CONN-148.