Address review issues