More fixes and more waiting...