Fixing schema NPE. Proper copyright headers.