some minor fixes to handle futures..