Fixes problems that still existed from Harald's prefixing.

Maybe there are still some problems remaining.