Bunch of little tweaks to the backend