Couple of updates

Christoph, these are the latest changes I made. I don't think you've pulled them yet.