Fixed some additional errors on linux after merging the os x changes.