Hotfix bug incorrect flag set during analyse process + additional bootstrap fix