minor changes to work properly with the backend