Some Fixes in flags