CFLAG changes