Small update after merging with upstream