Small fixes after first tests.