More fixes overlay's