Still trying to fix cryptic build errors