Running in release pre8
Fix DAF problems