Some backend improvements.