Back-end & fixes