more workarounds for partially broken builds