Fixed findbugs issues.

done. left `DataAwareEntryEvent` since I guess it's already included in your PRs.