Fixed compilation on Mac OS X
Updated subprojects