Further fixups after testing on milou