Digital Certificate Fixes

Bug 437