Un-inlined some functions