First pack of review fixes