Some Initialization Fixes

Now, Citadel waits a little longer to assert.