Fixed last PR comments.