Some review fixes