fixed fixes.xml some more

lots of id changes