Merge pull request #533 from dorkster/bugfixes

Lock ACCEPT when respawning