Misc fixes -- Add missing assert.