Some minor adjustments in backend