Fixed word wall bugs