Fix issues, that found by @alexott