Minor backend tweaks