More ID conflict fixes

(forgot to add this file to the last commit)