[FIX] Remove a couple more static table references
Merge pull request #1956 from barrybingo/development

[FIX] Remove a couple more static table references