Add attrs required for wait (bug 1024451)