Removed some findbugs warnings.