CFLAGS fixes