@gib: Small QA/Bug items

![image](https://cloud.githubusercontent.com/assets/555859/4986562/93e4defe-693c-11e4-9e84-61f12b9571f6.png)