I think you need to fix only the major fault - the number plate place I went to was near Ikea. Not sure if other places do it too.
Best to go to the new Traffic department in Madinat Khalifa. What is the minor fault?