Code review corrections #2