Small backend improvements