XD-891 Fix review comments