Changes to handle Migration to mavericks of build in Dundee.