SSP-2427 fixes from code review, including using transfer objects