Updating to compile with latest rust