Some Minor changes in Flange2