Fixed inlining issues