fixes after some tests