Uninline a couple more functions