incorparating find bugs issue fixes & fix for TA-933, TA-925, TA-924 and TA-923