Minor changes to backend and workflow