More waiting in the docket

cc @thieman