More fixes -- only one more to go