Replaced some more CL_Display calls