Fixed some issues reported by sensiolab insight.