Some adjustments for last pull request