Fixing return values so the module can be loaded