Minor bugfixes.  Still not fully working, since the resume() and create() schemes need to be updated.