Fix Register Stuff