review fixes to merge upstream