Fixing CLS related warnings.