fix WITH_*** flags