Fix inlining errors