s/IntConvertible/FromPrimitive/ & other small updates fro latest rust