First pull request's fixes