Further buildfix