Fixes for findbugs errors