Fixed -std stuff. (2/2)