minor fixes from sensio