bug fixes in FI