fix findbugs warnings
add changes as requested by George