Fix Registration Issues