Fixes to make this actually run forever.