Add some review fixes