mer buggfiks for prod