apply review fixes