CFLAG adjustments