Fixed errors, last commit of the day!