ID-conflict fixes

#IBlameTom