Finished up the review fixes