Minor changes in Core. Fixed assigment when declaring variable