Fixed some issues loading upcoming variables