FMT fixes