Small changes to the backend