Updates to deal Mavericks compilation problems