Finish Fixing Target Flags