Fixed case.
Smaller fixes for OSX.