Yes, that is definitely the first fix. I think, though, that I was always disappointed that they wound up overly involved while ultimately being nothing much more than magic-item-generating machines.
I didn't think that Downtime was very well executed either, but it was a little more broad...