Restructuring in process: changes in Core are coming
Fix a few errors, continue restructuring