Fix #758 core module overrides