More fixes for tomorrow.