[Core:] Fixed errors