Some minimal adjustments