fixes for StaticInline