fixing stuff so works on prod