Various Task related fixes