Fixed further errors with clashing prefixes