Category: Registry Fixes