Fixed errors created in earlier merge