- fixes after some tests