Register Fixes