Small changes to fix some errors from changes in the backend