Fixed concerns in merge request.