Minor tweaks from UI to backend