Insight fixes. 

Improvements from [here](https://insight.sensiolabs.com/projects/b2701cbf-5de2-4b56-bad4-fde2b14f86b1/analyses/8)