Last issues solved by code inspection of Jetbrains.