Fix of review comments