bugfixes with findbugs