Find bugs tweaks.
Fixed warning
Coverage