Various more fixes/changes.