Final review fixes