Some updates to resolve math via llvmmath