Back-end fixes