Registartion fixes