RTF-1338 fixes from code review