Failed registration fixes