Fixed review issues