Fix userdata handling mostly