Fixes for OS X
Fix OS X problems
Fixed case
Update
Updated includes