I didn't specifically have to update those two but thanks for adding them to the list. I just did all of this yesterday with Catalyst 5.80030, so I guess I was just really unlucky with my timing... Anyway, good to hear that this has been fixed now.