Fix to FST-15
fixing various issues