fixed stuff from findbugs