fixes and flag