Fixed warnings back when we submitted 2.1