Fixed registering stuff