More wal fixes