Planned changes and strengthened CFLAGS