Fixed some bugs with FML