Fix ordering of cvars