Fix register changes