Fixing Registration Bugs