Fixes from Sensio Inside