Changes to allow GeneratedTable to work on OS X