some small fixes from findbugs