Fixes from today.

I think this is all self-explanatory.