Minorly fixed the constructors in Core.
Test?