Fixed errors in the last merge