Fix some of the symbol inlining problems