more fixes for register