fixed build issues in fst leading to failure of 2.1 build