Fixes after some tests