Adjust code from manual merges