Fixed Registration Bugs