Fix some duplication