Some fixes
Get rid of futures