Additional fixes to CEntryStub