Fixed legacy globals