Fixing up build problems locally.

Not sure if these are things that happened with a slim update or
something else, either way they're fixed now.