Fixing build errors with latest rust