Tweaks + findbugs annotations dep