Fix 2585 and clean up warning in contributing.rst