Fixed some of the flags