Fixed some FindBugs-flagged bugs and added justification annotations when it's not a bug (bundled the annotations jar for this use)