Added a define that was needed on Linux.
Corrected two misnamed functions.