Yup, those are the same ones I have.
Glad to hear the flipper issue has corrected itself. Some times those things happen. I had a Black Jack with a slingshot that would only work for a couple minutes after the machine turned on, and a chime that would only fire occasionally. Took it to the York show and it did the same thing, then at some point during the day they both started working perfectly. Next day still perfect. Not sure about now since I sold it.