Prepare for extra CFLAGS add
Unfinished workaround about reboot troubles