More fixes. Make more robust.