Register fixes