[#3028] Few revies fixes.