Moved some flags I don't use out of the way