Moved $EXTRA_FLAGS