Building under Yosemite
Cleaned up deprecation warnings