More fixes/changes.