Fixes from the review