Well, fixed one.

The other one is a little more complicated. It's a caching issue. Gotta run now but I'll get it sorted soon.