Several small fixes in Future