Fix flags to be more stable