Some small backend changes