Small improvements in the back-end code.