[Backend] Some housekeeping