Config changes all around