@craigspaeth: Random bugs

![image](https://cloud.githubusercontent.com/assets/555859/5370857/5fbd4e18-7ff8-11e4-8569-69234961b3e9.png)