Fixed: some findbugs bugs