Some changes after using Findbugs