Corrections after findbugs run