Fixing minor issues from sensio insight build #1.