Gateway-3384 Fixes for code review