Eliminate some more Async.waits

And hopefully fix slot.pageName in the process