Review fixes included