Fixes made to the API ready for the demo