Improve FTA generation, fix Brendan bug report