New fixes toward a functional back-end