Small changes because this is not working on prod