Fixed errors introduced by the manual merge