some fixes after living tests