Core: Fixed errors