Support and fixes for legacy code