Small Fixes of review