Attempt to fix schema loading code