Further fixups after uppmax testing, now sent to staff