Even more cflag changes