Changes to support legacy compilers