back-end fixes