Replace deprecated findbugs annotations