Additional places to avoid entering the metainfo table
moved flag from constructor
Merge pull request #124 from ioVulture/master

Additional places to avoid entering the metainfo table