Fixes following review.