Fix busy timeouts

This is relative to archive-0.2.3-prep-rebased, but the github interface doesn't allow me to create a pull request relative to that.