Registry Fixes