Fixed errors in choice constructors