Cleaning up a few issues brought up by Sensio Insight.