Fixed a TODO. Removed async warnings.