Update version and reorder CFLAGS