Accomodate registry changes.