Fix last of the review feedback