More fix, mostly for registrer