Fixed errors from previous merge