Final (hopefully) changes to allow build on 2013b for the Mac.