Little fixes from the first deployement