Fixed issues and review comments.