some patches after unit tests