Review fixes

Some review fixes