Update traits for latest rust