Fixes per review.