Cherry-Picking two bugfixes to prod

Since we currently can not merge https://github.com/till/easybib-cookbooks/pull/515, I cherry-picked two bugfixes which are important for stable as well