Solutions for 6.23, 6.25

I guess already have a solution for 6.23 now, but figure I will just send this along anyway.