Make sure there are no unresolved Futures and few other minor fixes