Fixes after first tests