Minor fixes in CFLAGS and config options