e3451fd fixes for static