Fixed some small issues with the inlining to bring it up to date with the master branch