fix static fields that were being accessed non-statically