Changes for legacy compilers