Legacy code fixes

... changes.