Code-Review fixes