Fixes for the review