post review fixes