Build fixes for earlier llvms