Backend tweaks

Backend tweaks are ready to get pushed to the master