Fail/done improvements and linking