Fixed some issues reported by Sensio Insight.