Minor last-minute fixes

![screenshot 2014-04-16 at 21 48 19](https://cloud.githubusercontent.com/assets/3346/2724339/130b9592-c5a0-11e3-9a4d-910ba9ff406c.png)