Fex bug fixes