Fixed errors from last commit