Fix registry builder