More FFt fixes