Build pass on Mavericks