Some fixes and improvements to futures