Various other fixes/changes.