Fixed some CL package loading issues.