More attempts to fix static errors