Fixes so we can import these classes as a module in other projects