Commentaries, fix linker error