XD-1091 Fix review comments